From 4d00dc893bc80164e6fcaa81e9d7ca9d9f7c27f2 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Sat, 28 Oct 2006 11:41:55 +0100 Subject: [PATCH] The on-wire names for the fields should be exactly as documented, including case. Signed-off-by: Ewan Mellor --- tools/libxen/src/xen_host.c | 6 +++--- tools/libxen/src/xen_network.c | 4 ++-- tools/libxen/src/xen_pif.c | 6 +++--- tools/libxen/src/xen_sr.c | 2 +- tools/libxen/src/xen_vbd.c | 4 ++-- tools/libxen/src/xen_vdi.c | 4 ++-- tools/libxen/src/xen_vif.c | 6 +++--- tools/libxen/src/xen_vm.c | 12 ++++++------ tools/libxen/src/xen_vtpm.c | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tools/libxen/src/xen_host.c b/tools/libxen/src/xen_host.c index 0eb26e8cfe..7e5600aed8 100644 --- a/tools/libxen/src/xen_host.c +++ b/tools/libxen/src/xen_host.c @@ -52,13 +52,13 @@ static const struct_member xen_host_record_struct_members[] = { .key = "software_version", .type = &abstract_type_string_string_map, .offset = offsetof(xen_host_record, software_version) }, - { .key = "resident_vms", + { .key = "resident_VMs", .type = &abstract_type_ref_set, .offset = offsetof(xen_host_record, resident_vms) }, - { .key = "pifs", + { .key = "PIFs", .type = &abstract_type_ref_set, .offset = offsetof(xen_host_record, pifs) }, - { .key = "host_cpus", + { .key = "host_CPUs", .type = &abstract_type_ref_set, .offset = offsetof(xen_host_record, host_cpus) } }; diff --git a/tools/libxen/src/xen_network.c b/tools/libxen/src/xen_network.c index 4b336a10b2..129617199f 100644 --- a/tools/libxen/src/xen_network.c +++ b/tools/libxen/src/xen_network.c @@ -47,10 +47,10 @@ static const struct_member xen_network_record_struct_members[] = { .key = "name_description", .type = &abstract_type_string, .offset = offsetof(xen_network_record, name_description) }, - { .key = "vifs", + { .key = "VIFs", .type = &abstract_type_ref_set, .offset = offsetof(xen_network_record, vifs) }, - { .key = "pifs", + { .key = "PIFs", .type = &abstract_type_ref_set, .offset = offsetof(xen_network_record, pifs) }, { .key = "default_gateway", diff --git a/tools/libxen/src/xen_pif.c b/tools/libxen/src/xen_pif.c index 165b49e1bc..92ca6508d1 100644 --- a/tools/libxen/src/xen_pif.c +++ b/tools/libxen/src/xen_pif.c @@ -50,13 +50,13 @@ static const struct_member xen_pif_record_struct_members[] = { .key = "host", .type = &abstract_type_ref, .offset = offsetof(xen_pif_record, host) }, - { .key = "mac", + { .key = "MAC", .type = &abstract_type_string, .offset = offsetof(xen_pif_record, mac) }, - { .key = "mtu", + { .key = "MTU", .type = &abstract_type_int, .offset = offsetof(xen_pif_record, mtu) }, - { .key = "vlan", + { .key = "VLAN", .type = &abstract_type_string, .offset = offsetof(xen_pif_record, vlan) }, { .key = "io_read_kbs", diff --git a/tools/libxen/src/xen_sr.c b/tools/libxen/src/xen_sr.c index 4b3029bba4..0454e786f1 100644 --- a/tools/libxen/src/xen_sr.c +++ b/tools/libxen/src/xen_sr.c @@ -46,7 +46,7 @@ static const struct_member xen_sr_record_struct_members[] = { .key = "name_description", .type = &abstract_type_string, .offset = offsetof(xen_sr_record, name_description) }, - { .key = "vdis", + { .key = "VDIs", .type = &abstract_type_ref_set, .offset = offsetof(xen_sr_record, vdis) }, { .key = "virtual_allocation", diff --git a/tools/libxen/src/xen_vbd.c b/tools/libxen/src/xen_vbd.c index f093bbffa9..228b60943d 100644 --- a/tools/libxen/src/xen_vbd.c +++ b/tools/libxen/src/xen_vbd.c @@ -43,10 +43,10 @@ static const struct_member xen_vbd_record_struct_members[] = { .key = "uuid", .type = &abstract_type_string, .offset = offsetof(xen_vbd_record, uuid) }, - { .key = "vm", + { .key = "VM", .type = &abstract_type_ref, .offset = offsetof(xen_vbd_record, vm) }, - { .key = "vdi", + { .key = "VDI", .type = &abstract_type_ref, .offset = offsetof(xen_vbd_record, vdi) }, { .key = "device", diff --git a/tools/libxen/src/xen_vdi.c b/tools/libxen/src/xen_vdi.c index 85f25e5510..f3d2749d87 100644 --- a/tools/libxen/src/xen_vdi.c +++ b/tools/libxen/src/xen_vdi.c @@ -48,10 +48,10 @@ static const struct_member xen_vdi_record_struct_members[] = { .key = "name_description", .type = &abstract_type_string, .offset = offsetof(xen_vdi_record, name_description) }, - { .key = "sr", + { .key = "SR", .type = &abstract_type_ref, .offset = offsetof(xen_vdi_record, sr) }, - { .key = "vbds", + { .key = "VBDs", .type = &abstract_type_ref_set, .offset = offsetof(xen_vdi_record, vbds) }, { .key = "virtual_size", diff --git a/tools/libxen/src/xen_vif.c b/tools/libxen/src/xen_vif.c index 5d8df97e5d..ac096a3cfd 100644 --- a/tools/libxen/src/xen_vif.c +++ b/tools/libxen/src/xen_vif.c @@ -54,13 +54,13 @@ static const struct_member xen_vif_record_struct_members[] = { .key = "network", .type = &abstract_type_ref, .offset = offsetof(xen_vif_record, network) }, - { .key = "vm", + { .key = "VM", .type = &abstract_type_ref, .offset = offsetof(xen_vif_record, vm) }, - { .key = "mac", + { .key = "MAC", .type = &abstract_type_string, .offset = offsetof(xen_vif_record, mac) }, - { .key = "mtu", + { .key = "MTU", .type = &abstract_type_int, .offset = offsetof(xen_vif_record, mtu) }, { .key = "io_read_kbs", diff --git a/tools/libxen/src/xen_vm.c b/tools/libxen/src/xen_vm.c index 6ab0ca12cc..0f71313a94 100644 --- a/tools/libxen/src/xen_vm.c +++ b/tools/libxen/src/xen_vm.c @@ -120,19 +120,19 @@ static const struct_member xen_vm_record_struct_members[] = { .key = "actions_after_crash", .type = &xen_on_crash_behaviour_abstract_type_, .offset = offsetof(xen_vm_record, actions_after_crash) }, - { .key = "vifs", + { .key = "VIFs", .type = &abstract_type_ref_set, .offset = offsetof(xen_vm_record, vifs) }, - { .key = "vbds", + { .key = "VBDs", .type = &abstract_type_ref_set, .offset = offsetof(xen_vm_record, vbds) }, - { .key = "vtpms", + { .key = "VTPMs", .type = &abstract_type_ref_set, .offset = offsetof(xen_vm_record, vtpms) }, { .key = "bios_boot", .type = &abstract_type_string, .offset = offsetof(xen_vm_record, bios_boot) }, - { .key = "platform_std_vga", + { .key = "platform_std_VGA", .type = &abstract_type_bool, .offset = offsetof(xen_vm_record, platform_std_vga) }, { .key = "platform_serial", @@ -165,13 +165,13 @@ static const struct_member xen_vm_record_struct_members[] = { .key = "grub_cmdline", .type = &abstract_type_string, .offset = offsetof(xen_vm_record, grub_cmdline) }, - { .key = "pci_bus", + { .key = "PCI_bus", .type = &abstract_type_string, .offset = offsetof(xen_vm_record, pci_bus) }, { .key = "tools_version", .type = &abstract_type_string_string_map, .offset = offsetof(xen_vm_record, tools_version) }, - { .key = "otherconfig", + { .key = "otherConfig", .type = &abstract_type_string_string_map, .offset = offsetof(xen_vm_record, otherconfig) } }; diff --git a/tools/libxen/src/xen_vtpm.c b/tools/libxen/src/xen_vtpm.c index c5266b19d4..75e90026f3 100644 --- a/tools/libxen/src/xen_vtpm.c +++ b/tools/libxen/src/xen_vtpm.c @@ -42,7 +42,7 @@ static const struct_member xen_vtpm_record_struct_members[] = { .key = "uuid", .type = &abstract_type_string, .offset = offsetof(xen_vtpm_record, uuid) }, - { .key = "vm", + { .key = "VM", .type = &abstract_type_ref, .offset = offsetof(xen_vtpm_record, vm) }, { .key = "backend", -- 2.30.2